Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Thu, 15 Dec 2011 21:32:48 +0000 (13:32 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Thu, 15 Dec 2011 21:32:48 +0000 (13:32 -0800)
commit8012d269734457c44fccda377d621b0d6cb90fdb
treeebe9bbd8e6b59b8867b7cf77eb81cc67155dc324
parente8a4253c1a3fa9c5dda5e8c8752fe0d63a3a84e3
parent25eca15953da97e0bd04d29a11a1008ba8637264
Merge from trunk.